Applied patch from Matteo 'Peach' Pescarin which makes build use rsvg

* configure.ac:
* docs/graphics/Makefile.am: Applied patch from Matteo 'Peach'
Pescarin which makes build use rsvg binary instead of inkscape
to create pngs. Fixes bug 571516.

svn path=/trunk/; revision=403

diff --git a/ChangeLog b/ChangeLog
index 595ad750d2e747b1cf5505dcf30d6134507f64c0..4518937d27adbb46963192e02fd37f0582635f66 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-03-27  Kevin Cozens  <kcozens@cvs.gnome.org>
+
+       * configure.ac: 
+       * docs/graphics/Makefile.am: Applied patch from Matteo 'Peach'
+       Pescarin which makes build use rsvg binary instead of inkscape
+       to create pngs. Fixes bug 571516.
+
 2009-03-26  Manish Singh  <yosh@gimp.org>
 
        * configure.ac: BABL_VARIADIC_MACROS needs to be called before

diff --git a/configure.ac b/configure.ac
index fe4c67684c0450bcff550a2b4bc6f4e4fd36a830..edb9b8040ae8dad9741cfe22712729a1b60175f3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -134,8 +134,8 @@ BABL_DETECT_CFLAGS(extra_warnings, '-Wold-style-definition')
 CFLAGS="$CFLAGS $extra_warnings"
 
 
-AC_PATH_PROG(INKSCAPE, inkscape, no)
-AM_CONDITIONAL(HAVE_INKSCAPE, test "x$INKSCAPE" != "xno")
+AC_PATH_PROG(RSVG, rsvg, no)
+AM_CONDITIONAL(HAVE_RSVG, test "x$RSVG" != "xno")
 
 AC_PATH_PROG(W3M, w3m, no)
 AM_CONDITIONAL(HAVE_W3M, test "x$W3M" != "xno")

diff --git a/docs/graphics/Makefile.am b/docs/graphics/Makefile.am
index c630ef2e940d885b5c87bf85b968aa01dec19194..b72c9b0fa59835e005701b91c01daa76bd849497 100644 (file)
--- a/docs/graphics/Makefile.am
+++ b/docs/graphics/Makefile.am
@@ -1,6 +1,6 @@
 .SILENT:
 
-if HAVE_INKSCAPE
+if HAVE_RSVG
 PNG_FILES =                    \
        babl-a4poster.png       \
        babl-16x16.png          \
@@ -21,18 +21,18 @@ MAINTAINERCLEANFILES = $(PNG_FILES)
 
 all: $(MAINTAINERCLEANFILES)
 
-INKSCAPE_CMD = echo -n " SVG: $@" ;\
-  $(INKSCAPE) -e $@ $< 2&>/dev/null\
+RSVG_CMD = echo -n " SVG: $@" ;\
+  $(RSVG) $< $@\
     &&\
       echo " [OK]"\
     ||\
       echo " FAIL"
 
-if HAVE_INKSCAPE
-dist-check-inkscape:
+if HAVE_RSVG
+dist-check-rsvg:
 
 %.png: %.svg
-       $(INKSCAPE_CMD)
+       $(RSVG_CMD)
 #-e $@ $< 2>/dev/null
 
 # the png version of the a4 poster is used as a webgraphic
@@ -40,16 +40,16 @@ dist-check-inkscape:
 # 0.0
 babl-a4poster.png: babl-a4poster.svg
        echo -n " SVG: $@" ;\
-       $(INKSCAPE) -e $@ $< -w 256 -y 0 2&>/dev/null\
+       $(RSVG) -w 256 $< $@\
          &&\
            echo " [OK]"\
          ||\
            echo " FAIL"
 else
-dist-check-inkscape:
-       @echo "*** inkscape must be available in order to make dist"
+dist-check-rsvg:
+       @echo "*** rsvg must be available in order to make dist"
        @false
 endif
 
 
-dist-hook: dist-check-inkscape
+dist-hook: dist-check-rsvg